Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-23.1: upgrades: deflake TestMigrationWithFailures #100666

Merged
merged 1 commit into from
Apr 5, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Apr 4, 2023

Backport 1/1 commits from #100644 on behalf of @ajwerner.

/cc @cockroachdb/release


We need to properly inject the bootstrap version, and we need to not step through too many version or enable any version gates.

Fixes #98564
Fixes #98991

Release note: None


Release justification: test fix

We need to properly inject the bootstrap version, and we need to
not step through too many version or enable any version gates.

Fixes #98564
Informs #98991

Release note: None
@blathers-crl blathers-crl bot requested a review from a team April 4, 2023 23:33
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-100644 branch 2 times, most recently from 4693ee9 to e74ac43 Compare April 4, 2023 23:33
@blathers-crl
Copy link
Author

blathers-crl bot commented Apr 4, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ajwerner ajwerner merged commit 9734b8e into release-23.1 Apr 5, 2023
@ajwerner ajwerner deleted the blathers/backport-release-23.1-100644 branch April 5, 2023 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants